Prevent $DISPLAY from being overridden in SSH (for X11 forwarding)#216
Open
InnovativeInventor wants to merge 1 commit intoQubesOS:mainfrom
Open
Prevent $DISPLAY from being overridden in SSH (for X11 forwarding)#216InnovativeInventor wants to merge 1 commit intoQubesOS:mainfrom
InnovativeInventor wants to merge 1 commit intoQubesOS:mainfrom
Conversation
When trying to ssh into a qubes vm, `/etc/profile.d/qubes-gui.sh` will improperly set `$DISPLAY` to be :0. When X11 forwarding is used, `$DISPLAY` is automatically set to ensure that the relevant windows get forwarded to the ssh client. However, since qubes-gui.sh is called after a successful login, the correct value for `$DISPLAY` will be overridden. This commit fixes the issue by adding a test in qubes-gui.sh to check if we are currently in an ssh session (by checking if `$SSH_CLIENT` or `$SSH_TTY` are set). Note: I do not know .csh scripts and have not tested the proposed change to qubes-gui.csh, yet.
InnovativeInventor
force-pushed
the
main
branch
from
2c0714a to
4045238
Compare
marmarek
requested changes
Sep 29, 2024
Comment on lines
+1
to
+3
| if ! ([ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] ]); then | ||
| export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1 | ||
| fi |
Member
There was a problem hiding this comment.
First, this should apply only to DISPLAY, not the other variable.
But second, having it specifically for SSH isn't very elegant. Maybe better simply check if it's set already and not override it then? This can be done simpler:
: ${DISPLAY:=:0}
export DISPLAY
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When trying to ssh into a qubes vm,
/etc/profile.d/qubes-gui.shwill improperly set$DISPLAYto be :0. When X11 forwarding is used,$DISPLAYis automatically set to ensure that the relevant windows get forwarded to the ssh client. However, since qubes-gui.sh is called after a successful login, the correct value for$DISPLAYwill be overridden.This commit fixes the issue by adding a test in qubes-gui.sh to check if we are currently in an ssh session (by checking if
$SSH_CLIENTor$SSH_TTYare set).Note: I do not know .csh scripts and have not tested the proposed change to qubes-gui.csh, yet.